Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gcc: revert "provide both native and cross forms of gcc.libs libraries" #213929

Merged
merged 1 commit into from
Feb 1, 2023
Merged

gcc: revert "provide both native and cross forms of gcc.libs libraries" #213929

merged 1 commit into from
Feb 1, 2023

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Feb 1, 2023 •
edited
Loading

This reverts commit 2c931bd.

The #209153 reverted --sysroot=/ change as it broke other astects of library search paths.

While it might still be useful to pull in gcc libraries when non-standard --sysroot= is passed there are no meaningful use cases of it in nixpkgs yet. Let's revert it for now.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi
gcc: revert "provide both native and cross forms of gcc.libs libraries"
b8b5fc1 
This reverts commit 2c931bd.

The NixOS#209153 reverted --sysroot=/
change as it broke other astects of library search paths.

While it might still be useful to pull in gcc libraries when
non-standard --sysroot= is passed there are no meaningful use cases of
it in `nixpkgs` yet. Let's revert it for now.
@trofi trofi mentioned this pull request Feb 1, 2023
Merged
13 tasks
@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-linux-stdenv labels Feb 1, 2023
@Ericson2314 Ericson2314 merged commit baa1d98 into NixOS:staging Feb 1, 2023
@trofi trofi deleted the revert-gcc.cc.lib-symlink branch February 1, 2023 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@veprbl veprbl Awaiting requested review from veprbl

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@trofi @Ericson2314